extensionUtils: Don't crash on startup for an empty directory

https://bugzilla.gnome.org/show_bug.cgi?id=679099

diff --git a/js/misc/extensionUtils.js b/js/misc/extensionUtils.js
index cec24ba1dd6c8bd74676aac37a41673e167788ae..40e001bbe017689205eec614e4e6cf33b2de84f0 100644 (file)
--- a/js/misc/extensionUtils.js
+++ b/js/misc/extensionUtils.js
@@ -177,7 +177,14 @@ const ExtensionFinder = new Lang.Class({
                 log('Extension %s already installed in %s. %s will not be loaded'.format(uuid, existing.path, extensionDir.get_path()));
                 continue;
             }
-            let extension = createExtensionObject(uuid, extensionDir, type);
+
+            let extension;
+            try {
+                extension = createExtensionObject(uuid, extensionDir, type);
+            } catch(e) {
+                logError(e, 'Could not load extension %s'.format(uuid));
+                continue;
+            }
             this.emit('extension-found', extension);
         }
         fileEnum.close(null);